From 03e3dba1d22c7d7b241ba6ccd473b88414457ac5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Steinbrink?= Date: Wed, 17 Sep 2014 11:08:27 +0200 Subject: [PATCH] Update to new iter names to fix building with current rustc --- src/bin/cargo.rs | 2 +- src/cargo/core/registry.rs | 4 ++-- src/cargo/core/source.rs | 8 ++++---- src/cargo/ops/cargo_fetch.rs | 4 ++-- src/cargo/ops/cargo_read_manifest.rs | 2 +- src/cargo/ops/cargo_rustc/job_queue.rs | 4 ++-- src/cargo/ops/cargo_rustc/mod.rs | 6 +++--- src/cargo/sources/git/source.rs | 2 +- src/cargo/sources/git/utils.rs | 2 +- src/cargo/sources/path.rs | 2 +- src/cargo/sources/registry.rs | 2 +- src/cargo/util/config.rs | 8 ++++---- src/cargo/util/dependency_queue.rs | 2 +- src/cargo/util/toml.rs | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs index 017abb33a..a0b024f7b 100644 --- a/src/bin/cargo.rs +++ b/src/bin/cargo.rs @@ -82,7 +82,7 @@ fn execute(flags: Flags, shell: &mut MultiShell) -> CliResult> { if flags.flag_list { println!("Installed Commands:"); - for command in list_commands().move_iter() { + for command in list_commands().into_iter() { println!(" {}", command); }; return Ok(None) diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 63eadc2dc..369ad7bf6 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -107,7 +107,7 @@ impl<'a> PackageRegistry<'a> { for s in self.overrides.iter() { let src = self.sources.get_mut(s).unwrap(); let dep = Dependency::new_override(dep.get_name(), s); - ret.extend(try!(src.query(&dep)).move_iter().filter(|s| { + ret.extend(try!(src.query(&dep)).into_iter().filter(|s| { seen.insert(s.get_name().to_string()) })); } @@ -118,7 +118,7 @@ impl<'a> PackageRegistry<'a> { fn dedup(ids: Vec) -> Vec { let mut seen = vec!(); - for id in ids.move_iter() { + for id in ids.into_iter() { if seen.contains(&id) { continue; } seen.push(id); } diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs index 86192b464..145776558 100644 --- a/src/cargo/core/source.rs +++ b/src/cargo/core/source.rs @@ -330,7 +330,7 @@ impl<'a> SourceMap<'a> { } pub fn sources_mut(&'a mut self) -> SourcesMut<'a> { - self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s }) + self.map.iter_mut().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s }) } } @@ -348,7 +348,7 @@ impl<'a> Registry for SourceSet<'a> { fn query(&mut self, name: &Dependency) -> CargoResult> { let mut ret = Vec::new(); - for source in self.sources.mut_iter() { + for source in self.sources.iter_mut() { ret.push_all_move(try!(source.query(name))); } @@ -358,7 +358,7 @@ impl<'a> Registry for SourceSet<'a> { impl<'a> Source for SourceSet<'a> { fn update(&mut self) -> CargoResult<()> { - for source in self.sources.mut_iter() { + for source in self.sources.iter_mut() { try!(source.update()); } @@ -366,7 +366,7 @@ impl<'a> Source for SourceSet<'a> { } fn download(&mut self, packages: &[PackageId]) -> CargoResult<()> { - for source in self.sources.mut_iter() { + for source in self.sources.iter_mut() { try!(source.download(packages)); } diff --git a/src/cargo/ops/cargo_fetch.rs b/src/cargo/ops/cargo_fetch.rs index 3cdb92fbe..4120c4384 100644 --- a/src/cargo/ops/cargo_fetch.rs +++ b/src/cargo/ops/cargo_fetch.rs @@ -56,7 +56,7 @@ pub fn resolve_and_fetch(registry: &mut PackageRegistry, package: &Package) fn add_lockfile_sources(registry: &mut PackageRegistry, root: &Package, resolve: &Resolve) -> CargoResult<()> { - let deps = resolve.deps(root.get_package_id()).move_iter().flat_map(|deps| { + let deps = resolve.deps(root.get_package_id()).into_iter().flat_map(|deps| { deps.map(|d| (d.get_name(), d)) }).collect::>(); @@ -91,7 +91,7 @@ fn add_lockfile_sources(registry: &mut PackageRegistry, fn fill_with_deps<'a>(resolve: &'a Resolve, dep: &'a PackageId, set: &mut HashSet<&'a PackageId>) { if !set.insert(dep) { return } - for mut deps in resolve.deps(dep).move_iter() { + for mut deps in resolve.deps(dep).into_iter() { for dep in deps { fill_with_deps(resolve, dep, set); } diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs index a52f98df0..7681a6540 100644 --- a/src/cargo/ops/cargo_read_manifest.rs +++ b/src/cargo/ops/cargo_read_manifest.rs @@ -105,7 +105,7 @@ fn read_nested_packages(path: &Path, source_id: &SourceId, } fn push_all(set: &mut Vec, packages: Vec) { - for package in packages.move_iter() { + for package in packages.into_iter() { if set.contains(&package) { continue; } set.push(package) diff --git a/src/cargo/ops/cargo_rustc/job_queue.rs b/src/cargo/ops/cargo_rustc/job_queue.rs index 7c32426c7..6372acaf8 100644 --- a/src/cargo/ops/cargo_rustc/job_queue.rs +++ b/src/cargo/ops/cargo_rustc/job_queue.rs @@ -164,7 +164,7 @@ impl<'a, 'b> JobQueue<'a, 'b> { fresh: fresh, }); - for (job, job_freshness) in jobs.move_iter() { + for (job, job_freshness) in jobs.into_iter() { let fresh = job_freshness.combine(fresh); let my_tx = self.tx.clone(); let id = id.clone(); @@ -198,7 +198,7 @@ impl<'a> Dependency<&'a Resolve> for (&'a PackageId, TargetStage) { let (id, stage) = *self; match stage { StageStart => { - resolve.deps(id).move_iter().flat_map(|a| a).filter(|dep| { + resolve.deps(id).into_iter().flat_map(|a| a).filter(|dep| { *dep != id }).map(|dep| { (dep, StageEnd) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 073110fde..a94d93ae1 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -132,7 +132,7 @@ fn compile<'a, 'b>(targets: &[&'a Target], pkg: &'a Package, _ => format!("custom build commands"), }; let dirty = proc() { - for cmd in build_cmds.move_iter() { try!(cmd()) } + for cmd in build_cmds.into_iter() { try!(cmd()) } dirty() }; jobs.enqueue(pkg, StageCustomBuild, vec![(Job::new(dirty, fresh, desc), @@ -154,7 +154,7 @@ fn compile<'a, 'b>(targets: &[&'a Target], pkg: &'a Package, }; let dst = if target.is_lib() {&mut libs} else {&mut bins}; - for (work, kind, desc) in work.move_iter() { + for (work, kind, desc) in work.into_iter() { let (freshness, dirty, fresh) = try!(fingerprint::prepare_target(cx, pkg, target, kind)); @@ -239,7 +239,7 @@ fn rustc(package: &Package, target: &Target, let primary = cx.primary; let rustcs = try!(prepare_rustc(package, target, crate_types, cx, req)); - Ok(rustcs.move_iter().map(|(rustc, kind)| { + Ok(rustcs.into_iter().map(|(rustc, kind)| { let name = package.get_name().to_string(); let desc = rustc.to_string(); diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index 2f6903f95..b68a6e9ef 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -109,7 +109,7 @@ pub fn canonicalize_url(url: &Url) -> Url { rel.port = Some(443); rel.default_port = Some(443); let path = mem::replace(&mut rel.path, Vec::new()); - rel.path = path.move_iter().map(|s| { + rel.path = path.into_iter().map(|s| { s.as_slice().chars().map(|c| c.to_lowercase()).collect() }).collect(); } diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs index 532508865..03919f45d 100644 --- a/src/cargo/sources/git/utils.rs +++ b/src/cargo/sources/git/utils.rs @@ -307,7 +307,7 @@ impl<'a> GitCheckout<'a> { fn update_submodules(repo: &git2::Repository) -> CargoResult<()> { info!("update submodules for: {}", repo.path().display()); - for mut child in try!(repo.submodules()).move_iter() { + for mut child in try!(repo.submodules()).into_iter() { try!(child.init(false)); let url = try!(child.url().require(|| { internal("non-utf8 url for submodule") diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 57f7a5753..797707569 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -90,7 +90,7 @@ impl PathSource { Pattern::new(p.as_slice()) }).collect::>(); - Ok(candidates.move_iter().filter(|candidate| { + Ok(candidates.into_iter().filter(|candidate| { let relative_path = candidate.path_relative_from(&root).unwrap(); !pats.iter().any(|p| p.matches_path(&relative_path)) && candidate.is_file() diff --git a/src/cargo/sources/registry.rs b/src/cargo/sources/registry.rs index d261b1d68..3a91e78d1 100644 --- a/src/cargo/sources/registry.rs +++ b/src/cargo/sources/registry.rs @@ -276,7 +276,7 @@ impl<'a, 'b> Source for RegistrySource<'a, 'b> { fn get(&self, packages: &[PackageId]) -> CargoResult> { let mut ret = Vec::new(); for src in self.sources.iter() { - ret.extend(try!(src.get(packages)).move_iter()); + ret.extend(try!(src.get(packages)).into_iter()); } return Ok(ret); } diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs index c0324b891..b780d9435 100644 --- a/src/cargo/util/config.rs +++ b/src/cargo/util/config.rs @@ -160,11 +160,11 @@ impl ConfigValue { (&Boolean(..), Boolean(..)) => {} (&List(ref mut old), List(ref mut new)) => { let new = mem::replace(new, Vec::new()); - old.extend(new.move_iter()); + old.extend(new.into_iter()); } (&Table(ref mut old), Table(ref mut new)) => { let new = mem::replace(new, HashMap::new()); - for (key, value) in new.move_iter() { + for (key, value) in new.into_iter() { let mut err = Ok(()); old.find_with_or_insert_with(key, value, |_, old, new| err = old.merge(new), @@ -226,9 +226,9 @@ impl ConfigValue { match self { Boolean(s, _) => toml::Boolean(s), String(s, _) => toml::String(s), - List(l) => toml::Array(l.move_iter().map(|(s, _)| toml::String(s)) + List(l) => toml::Array(l.into_iter().map(|(s, _)| toml::String(s)) .collect()), - Table(l) => toml::Table(l.move_iter() + Table(l) => toml::Table(l.into_iter() .map(|(k, v)| (k, v.into_toml())) .collect()), } diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs index 28070e299..8bad65533 100644 --- a/src/cargo/util/dependency_queue.rs +++ b/src/cargo/util/dependency_queue.rs @@ -77,7 +77,7 @@ impl, V> DependencyQueue { } let mut my_dependencies = HashSet::new(); - for dep in key.dependencies(cx).move_iter() { + for dep in key.dependencies(cx).into_iter() { assert!(my_dependencies.insert(dep.clone())); let rev = self.reverse_dep_map.find_or_insert(dep, HashSet::new()); assert!(rev.insert(key.clone())); diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs index 78ca4769f..ec2e675ff 100644 --- a/src/cargo/util/toml.rs +++ b/src/cargo/util/toml.rs @@ -49,7 +49,7 @@ fn try_add_file(files: &mut Vec, root: &Path, dir: &str) { fn try_add_files(files: &mut Vec, root: &Path, dir: &str) { match fs::readdir(&root.join(dir)) { Ok(new) => { - files.extend(new.move_iter().filter(|f| f.extension_str() == Some("rs"))) + files.extend(new.into_iter().filter(|f| f.extension_str() == Some("rs"))) } Err(_) => {/* just don't add anything if the directory doesn't exist, etc. */} } @@ -651,7 +651,7 @@ fn normalize(libs: &[TomlLibTarget], } if target.plugin == Some(true) { - ret = ret.move_iter().map(|p| p.plugin(true)).collect(); + ret = ret.into_iter().map(|p| p.plugin(true)).collect(); } ret -- 2.30.2